projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59f7522 c619da2)
bitkeeper revision 1.1409 (4285cffel2cHlgTVve7rKm7P52VnFw)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Sat, 14 May 2005 10:16:30 +0000 (10:16 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Sat, 14 May 2005 10:16:30 +0000 (10:16 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk

1  2 
buildconfigs/mk.linux-2.4-xen0 patch | diff1 | diff2 | blob | history
buildconfigs/mk.linux-2.4-xenU patch | diff1 | diff2 | blob | history
buildconfigs/mk.linux-2.6-xen0 patch | diff1 | diff2 | blob | history
buildconfigs/mk.linux-2.6-xenU patch | diff1 | diff2 | blob | history
linux-2.4.29-xen-sparse/arch/xen/Makefile patch | diff1 | diff2 | blob | history

diff --cc buildconfigs/mk.linux-2.4-xen0
Simple merge
diff --cc buildconfigs/mk.linux-2.4-xenU
Simple merge
diff --cc buildconfigs/mk.linux-2.6-xen0
Simple merge
diff --cc buildconfigs/mk.linux-2.6-xenU
Simple merge
Unnamed repository; edit this file 'description' to name the repository.